s/GdkPixmapClass/GdkPixmapObjectClass/. (#51890, Jeff Franks)

Tue Jun  5 11:04:06 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkpixmap.h (GDK_PIXMAP_GET_CLASS):
	s/GdkPixmapClass/GdkPixmapObjectClass/. (#51890, Jeff Franks)

Mon Jun  4 12:50:11 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkctree.c (gtk_ctree_insert_gnode): Add a missing
	gtk_clist_thaw().

diff --git a/ChangeLog b/ChangeLog
index a8cab4e7978a894489ef6beee20425773133c5d9..8db2edeb2cd84dff891c7f26a66d31555d9880d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Jun  5 11:04:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixmap.h (GDK_PIXMAP_GET_CLASS): 
+       s/GdkPixmapClass/GdkPixmapObjectClass/. (#51890, Jeff Franks)
+
+Mon Jun  4 12:50:11 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_insert_gnode): Add a missing
+       gtk_clist_thaw().
+
 2001-06-04  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Ignore 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a8cab4e7978a894489ef6beee20425773133c5d9..8db2edeb2cd84dff891c7f26a66d31555d9880d6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+Tue Jun  5 11:04:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixmap.h (GDK_PIXMAP_GET_CLASS): 
+       s/GdkPixmapClass/GdkPixmapObjectClass/. (#51890, Jeff Franks)
+
+Mon Jun  4 12:50:11 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_insert_gnode): Add a missing
+       gtk_clist_thaw().
+
 2001-06-04  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Ignore 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a8cab4e7978a894489ef6beee20425773133c5d9..8db2edeb2cd84dff891c7f26a66d31555d9880d6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Tue Jun  5 11:04:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixmap.h (GDK_PIXMAP_GET_CLASS): 
+       s/GdkPixmapClass/GdkPixmapObjectClass/. (#51890, Jeff Franks)
+
+Mon Jun  4 12:50:11 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_insert_gnode): Add a missing
+       gtk_clist_thaw().
+
 2001-06-04  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Ignore 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a8cab4e7978a894489ef6beee20425773133c5d9..8db2edeb2cd84dff891c7f26a66d31555d9880d6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Tue Jun  5 11:04:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixmap.h (GDK_PIXMAP_GET_CLASS): 
+       s/GdkPixmapClass/GdkPixmapObjectClass/. (#51890, Jeff Franks)
+
+Mon Jun  4 12:50:11 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_insert_gnode): Add a missing
+       gtk_clist_thaw().
+
 2001-06-04  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Ignore 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a8cab4e7978a894489ef6beee20425773133c5d9..8db2edeb2cd84dff891c7f26a66d31555d9880d6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Tue Jun  5 11:04:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixmap.h (GDK_PIXMAP_GET_CLASS): 
+       s/GdkPixmapClass/GdkPixmapObjectClass/. (#51890, Jeff Franks)
+
+Mon Jun  4 12:50:11 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_insert_gnode): Add a missing
+       gtk_clist_thaw().
+
 2001-06-04  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Ignore 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a8cab4e7978a894489ef6beee20425773133c5d9..8db2edeb2cd84dff891c7f26a66d31555d9880d6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Tue Jun  5 11:04:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixmap.h (GDK_PIXMAP_GET_CLASS): 
+       s/GdkPixmapClass/GdkPixmapObjectClass/. (#51890, Jeff Franks)
+
+Mon Jun  4 12:50:11 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_insert_gnode): Add a missing
+       gtk_clist_thaw().
+
 2001-06-04  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Ignore 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a8cab4e7978a894489ef6beee20425773133c5d9..8db2edeb2cd84dff891c7f26a66d31555d9880d6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Tue Jun  5 11:04:06 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkpixmap.h (GDK_PIXMAP_GET_CLASS): 
+       s/GdkPixmapClass/GdkPixmapObjectClass/. (#51890, Jeff Franks)
+
+Mon Jun  4 12:50:11 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkctree.c (gtk_ctree_insert_gnode): Add a missing
+       gtk_clist_thaw().
+
 2001-06-04  Havoc Pennington  <hp@pobox.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Ignore 

diff --git a/gdk/gdkpixmap.h b/gdk/gdkpixmap.h
index 47535609d85172ce4634645af6daea3e76e23827..abb044fd79c2ecc5c4557591babfe0aec20c8370 100644 (file)
--- a/gdk/gdkpixmap.h
+++ b/gdk/gdkpixmap.h
@@ -16,7 +16,7 @@ typedef struct _GdkPixmapObjectClass GdkPixmapObjectClass;
 #define GDK_PIXMAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXMAP, GdkPixmapObjectClass))
 #define GDK_IS_PIXMAP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_PIXMAP))
 #define GDK_IS_PIXMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXMAP))
-#define GDK_PIXMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXMAP, GdkPixmapClass))
+#define GDK_PIXMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXMAP, GdkPixmapObjectClass))
 #define GDK_PIXMAP_OBJECT(object)    ((GdkPixmapObject *) GDK_PIXMAP (object))
 
 struct _GdkPixmapObject

diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index b1f932a93d62a8b3ecdfebdfe54951e737d337e8..415fdeceec7bf45cf2f6b6c74f1c898e93c50cdb 100644 (file)
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -3765,6 +3765,7 @@ gtk_ctree_insert_gnode (GtkCTree          *ctree,
   if (!func (ctree, depth, gnode, cnode, data))
     {
       tree_delete_row (ctree, cnode, NULL);
+      gtk_clist_thaw (clist);
       return NULL;
     }